Try to fix salsa-build

diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
index 26871b96e668c80becdc10aa95e875a924e5af78..8aca11a811fdfae10286c221b5206c4d8be38af1 100644 (file)
--- a/debian/.gitlab-ci.yml
+++ b/debian/.gitlab-ci.yml
@@ -1,2 +1,9 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+  SALSABUILD: "YES"
+  SALSA_CI_DISABLE_BUILD_PACKAGE_I386: "yes"
+
+reprotest:
+  allow_failure: true

diff --git a/debian/rules b/debian/rules
index e28c06c6a0cbe4380394042521b5bfeaa8ba2ea6..7fbebee27bb1c873a378d99cf77bc862ef0be331 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,11 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4))
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif
 
+# If SALSABUILD is set we want to drop debug info as well
+ifneq ($(SALSABUILD),)
+  export DEB_CXXFLAGS_MAINT_APPEND += -g0
+endif
+
 %:
        dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python3 --with javahelper